From d400566102e517585ce3bf2d45a08fdd2b0019c1 Mon Sep 17 00:00:00 2001 From: Andreas Beckmann Date: Mon, 28 Jan 2019 02:44:29 +0100 Subject: [PATCH] Update Lintian overrides --- debian/changelog | 2 ++ debian/emacs-bin-common.lintian-overrides | 11 ++++------- debian/emacs-common.lintian-overrides | 1 - debian/emacsVAR.lintian-overrides | 4 ++-- debian/rules | 3 +++ 5 files changed, 11 insertions(+), 10 deletions(-) delete mode 100644 debian/emacs-common.lintian-overrides diff --git a/debian/changelog b/debian/changelog index 004b2ab6f42..d3dd7dc46c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,8 @@ emacs (1:26.1+1-3.1) UNRELEASED; urgency=medium * Use https:// URLs and update FSF address. + * Update Lintian overrides. + -- Andreas Beckmann Sun, 27 Jan 2019 16:56:15 +0100 emacs (1:26.1+1-3) unstable; urgency=medium diff --git a/debian/emacs-bin-common.lintian-overrides b/debian/emacs-bin-common.lintian-overrides index fc6ca285907..28a8ea62aea 100644 --- a/debian/emacs-bin-common.lintian-overrides +++ b/debian/emacs-bin-common.lintian-overrides @@ -1,7 +1,4 @@ -emacs-bin-common binary: binary-without-manpage usr/bin/b2m.emacs -emacs-bin-common binary: binary-without-manpage usr/bin/ctags.emacs -emacs-bin-common binary: binary-without-manpage usr/bin/ebrowse.emacs -emacs-bin-common binary: binary-without-manpage usr/bin/emacsclient.emacs -emacs-bin-common binary: binary-without-manpage usr/bin/etags.emacs -emacs-bin-common binary: binary-without-manpage usr/bin/grep-changelog.emacs -emacs-bin-common binary: binary-without-manpage usr/bin/rcs-checkin.emacs +binary-without-manpage usr/bin/ctags.emacs +binary-without-manpage usr/bin/ebrowse.emacs +binary-without-manpage usr/bin/emacsclient.emacs +binary-without-manpage usr/bin/etags.emacs diff --git a/debian/emacs-common.lintian-overrides b/debian/emacs-common.lintian-overrides deleted file mode 100644 index f5fc71d3294..00000000000 --- a/debian/emacs-common.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -emacs-common binary: desktop-command-not-in-package /usr/share/applications/emacs.desktop emacs diff --git a/debian/emacsVAR.lintian-overrides b/debian/emacsVAR.lintian-overrides index d9fd67f4089..5df7f2c95af 100644 --- a/debian/emacsVAR.lintian-overrides +++ b/debian/emacsVAR.lintian-overrides @@ -1,2 +1,2 @@ -@PKG_NAME@ binary: menu-icon-missing usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/16x16/apps/emacs.xpm -@PKG_NAME@ binary: menu-icon-missing usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/32x32/apps/emacs.xpm +# dpkg-maintscript-helper does not work due to arch:all to arch:any switch +maintainer-script-may-use-dir_to_symlink_helper diff --git a/debian/rules b/debian/rules index 34be2ec8846..4067d900162 100755 --- a/debian/rules +++ b/debian/rules @@ -128,10 +128,13 @@ nonpersistent_autogen_install_files := \ debian/emacs-common.README.Debian \ debian/emacs-common.postinst \ debian/emacs-common.prerm \ + debian/emacs-nox.lintian-overrides \ debian/emacs-nox.postinst \ debian/emacs-nox.prerm \ + debian/emacs-lucid.lintian-overrides \ debian/emacs-lucid.postinst \ debian/emacs-lucid.prerm \ + debian/emacs-gtk.lintian-overrides \ debian/emacs-gtk.postinst \ debian/emacs-gtk.prerm -- 2.30.2